From: Boris Ostrovsky Date: Mon, 30 Mar 2015 20:17:59 +0000 (-0400) Subject: flask: Update XEN_SYSCTL_cputopoinfo name X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~3504 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22man:///%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22man:/?a=commitdiff_plain;h=3e9c96f477f346d758bc28cacf76c0824bc4aa59;p=xen.git flask: Update XEN_SYSCTL_cputopoinfo name Commit 2090f14c5cbd ("sysctl: make XEN_SYSCTL_topologyinfo sysctl a little more efficient") renamed XEN_SYSCTL_topologyinfo to XEN_SYSCTL_cputopoinfo. It, however, neglected to update this macro for flask-related files. Signed-off-by: Boris Ostrovsky Reported-by: Wei Liu Acked-by: Daniel De Graaf Acked-by: Ian Campbell --- diff --git a/docs/misc/xsm-flask.txt b/docs/misc/xsm-flask.txt index e169937619..90a2aef969 100644 --- a/docs/misc/xsm-flask.txt +++ b/docs/misc/xsm-flask.txt @@ -116,7 +116,7 @@ __HYPERVISOR_sysctl (xen/include/public/sysctl.h) * XEN_SYSCTL_pm_op * XEN_SYSCTL_page_offline_op * XEN_SYSCTL_lockprof_op - * XEN_SYSCTL_topologyinfo + * XEN_SYSCTL_cputopoinfo * XEN_SYSCTL_numainfo * XEN_SYSCTL_cpupool_op * XEN_SYSCTL_scheduler_op diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 05dafedd70..4e2c1b7c93 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -783,7 +783,7 @@ static int flask_sysctl(int cmd) return domain_has_xen(current->domain, XEN__CPUPOOL_OP); case XEN_SYSCTL_physinfo: - case XEN_SYSCTL_topologyinfo: + case XEN_SYSCTL_cputopoinfo: case XEN_SYSCTL_numainfo: return domain_has_xen(current->domain, XEN__PHYSINFO); diff --git a/xen/xsm/flask/policy/access_vectors b/xen/xsm/flask/policy/access_vectors index 8f44b9d23a..fe5406d104 100644 --- a/xen/xsm/flask/policy/access_vectors +++ b/xen/xsm/flask/policy/access_vectors @@ -27,7 +27,7 @@ class xen mtrr_read # XENPF_microcode_update microcode -# XEN_SYSCTL_physinfo, XEN_SYSCTL_topologyinfo, XEN_SYSCTL_numainfo +# XEN_SYSCTL_physinfo, XEN_SYSCTL_cputopoinfo, XEN_SYSCTL_numainfo physinfo # XENPF_platform_quirk quirk